Use the standard apps tree for gnome-control-center panels desktop files

gnome-control-center is planning on removing its own tree in the
future. Since it already installs these applications into
/usr/share/applications, just use this for now.

https://bugzilla.gnome.org/show_bug.cgi?id=692483

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 58b7cb8ec2119e9815e97e1cd35e2e83d02b0e44..9807b627521fb1c4484f48f7b1b90c484dcc40e7 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -889,7 +889,7 @@ const PopupMenuBase = new Lang.Class({
 
     addSettingsAction: function(title, desktopFile) {
         let menuItem = this.addAction(title, function() {
-                           let app = Shell.AppSystem.get_default().lookup_setting(desktopFile);
+                           let app = Shell.AppSystem.get_default().lookup_app(desktopFile);
 
                            if (!app) {
                                log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index baa5a5e44780e8967368cba5f5aa2b5fa217fbff..a967ac276e242530e2e1387b36c716239f5f15db 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -822,7 +822,7 @@ const UserMenuButton = new Lang.Class({
 
     _onMyAccountActivate: function() {
         Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
+        let app = Shell.AppSystem.get_default().lookup_app('gnome-user-accounts-panel.desktop');
         app.activate();
     },
 

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index eb008d2f598172d23262bdb6ccb42740adf49cbc..61e86f53a0e116f78617f0274816208110064cca 100644 (file)
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -457,27 +457,6 @@ shell_app_system_get_tree (ShellAppSystem *self)
   return self->priv->apps_tree;
 }
 
-/**
- * shell_app_system_lookup_setting:
- * @system:
- * @id: desktop file id
- *
- * Returns: (transfer none): Application in gnomecc.menu, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_setting (ShellAppSystem *self,
-                                 const char     *id)
-{
-  ShellApp *app;
-
-  /* Actually defer to the main app set if there's overlap */
-  app = shell_app_system_lookup_app (self, id);
-  if (app != NULL)
-    return app;
-
-  return g_hash_table_lookup (self->priv->setting_id_to_app, id);
-}
-
 /**
  * shell_app_system_get_default:
  *

diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 788162247dd91690a7758654be609be2436e3cc2..78d37bd0cde7960810941bb50c1c5dc493b88604 100644 (file)
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -63,8 +63,4 @@ GSList         *shell_app_system_subsearch                 (ShellAppSystem  *sys
 GSList         *shell_app_system_search_settings           (ShellAppSystem *system,
                                                             GSList         *terms);
 
-ShellApp       *shell_app_system_lookup_setting            (ShellAppSystem *system,
-                                                            const char     *id);
-
-
 #endif /* __SHELL_APP_SYSTEM_H__ */